Merge git://git.denx.de/u-boot-rockchip

author Tom Rini <[email protected]>

Fri, 27 May 2016 19:48:53 +0000 (15:48 -0400)

committer Tom Rini <[email protected]>

Fri, 27 May 2016 19:48:53 +0000 (15:48 -0400)
author Tom Rini <[email protected]>
Fri, 27 May 2016 19:48:53 +0000 (15:48 -0400)
committer Tom Rini <[email protected]>
Fri, 27 May 2016 19:48:53 +0000 (15:48 -0400)
diff --cc drivers/net/designware.c
Simple merge
diff --cc drivers/net/designware.h
Simple merge
author	Tom Rini <[email protected]>
	Fri, 27 May 2016 19:48:53 +0000 (15:48 -0400)
committer	Tom Rini <[email protected]>
	Fri, 27 May 2016 19:48:53 +0000 (15:48 -0400)
		1	2
drivers/net/designware.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/designware.h	patch \|	diff1 \|	diff2 \|	blob \| history